From: Colin Walters <walters@verbum.org>
Date: Mon, 18 Sep 2017 19:46:03 +0000 (-0400)
Subject: lib/repo: Minor cleanup to object import function
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~31^2~61
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=3e564116b26992fa68f82abb3da08f7572151554;p=ostree.git

lib/repo: Minor cleanup to object import function

We have a lot of layers of abstraction here; let's fold in the `trusted`
conditional into the call, since that's all the public API we're using does
anyways.

Prep for a future patch around object copying during imports.

Closes: #1187
Approved by: jlebon
---

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index f779db85..440d2bf9 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -3598,23 +3598,12 @@ ostree_repo_import_object_from_with_trust (OstreeRepo           *self,
                                      &variant, error))
         return FALSE;
 
-      if (trusted)
-        {
-          if (!ostree_repo_write_metadata_trusted (self, objtype,
-                                                   checksum, variant,
-                                                   cancellable, error))
-            return FALSE;
-        }
-      else
-        {
-          g_autofree guchar *real_csum = NULL;
-
-          if (!ostree_repo_write_metadata (self, objtype,
-                                           checksum, variant,
-                                           &real_csum,
-                                           cancellable, error))
-            return FALSE;
-        }
+      g_autofree guchar *real_csum = NULL;
+      if (!ostree_repo_write_metadata (self, objtype,
+                                       checksum, variant,
+                                       trusted ? NULL : &real_csum,
+                                       cancellable, error))
+        return FALSE;
     }
   else
     {
@@ -3627,22 +3616,12 @@ ostree_repo_import_object_from_with_trust (OstreeRepo           *self,
                                            cancellable, error))
         return FALSE;
 
-      if (trusted)
-        {
-          if (!ostree_repo_write_content_trusted (self, checksum,
-                                                  object_stream, length,
-                                                  cancellable, error))
-            return FALSE;
-        }
-      else
-        {
-          g_autofree guchar *real_csum = NULL;
-          if (!ostree_repo_write_content (self, checksum,
-                                          object_stream, length,
-                                          &real_csum,
-                                          cancellable, error))
-            return FALSE;
-        }
+      g_autofree guchar *real_csum = NULL;
+      if (!ostree_repo_write_content (self, checksum,
+                                      object_stream, length,
+                                      trusted ? NULL : &real_csum,
+                                      cancellable, error))
+        return FALSE;
     }
 
   return TRUE;